- Fix javadoc errors, remove unused classes