CLEANUP removed javadoc warnings