Kill some unused imports and got rid of some warnings.