Removed a some stuff left over from previous Javadoc location.