Removed unused components
Fixed javadocs