Cosmetic changes, mainly remove unused imports and code

Change-Id: Ifec8423b922009b62ec9a57d598488d4d6a8fe65