eclipse stuff removed
refactoring