remove unused object
fix javadoc
add some final qualifier
remove unused imports