Java refactorings
unused refactoring and warning suppression