Removed unused imports.
Removed unused methods.
Static fields and methods should be accessed in a static way.
Removed an unused field.
Merge pull request #561 from NicoleRauch/master

Code cleanup