Fix deprecated code, remove unsed and other lint errors#133

wader wants to merge 1 commit intocortesi:mastercortesi/devd:masterfrom

wader:fix-lint-and-deprecated-unusedwader/devd:fix-lint-and-deprecated-unusedCopy head branch name to clipboard