Correct javadoc, indentation, delete no longer needed methods
Remove now unneeded stuff.