Adding javadocs and cutting out some vestigial code that was just cluttering up the api