Fixed some javadoc-errors. Removed some unused code.