changed some javadocs, removed some unneeded methods