Some more cleanup, start using eclipse cleanup before pushing guys