Added some javadoc and removed some old code

More javadoc for this class has to be added later on.