refactor code delete @Deprecated classes and add some javadocs