Cleanup and put back javadoc after move