Revert "cleanup"

This reverts commit da0bda5c2f8c1132d18f4c35e0230c6c537c0def.
cleanup
Merge origin/master
javadoc