Optimized Javadoc
Removed deprecated class