Remove useless code
Enhance javadoc