Removed unused code
Fixed JavaDoc