Remove a bunch of unused imports and other unnecessary warnings
Remove a bunch more eclipse warnings