Javadoc
Removed deprecated classes