Improved devkit compliance, remove unused methods and imports