Removing Javadoc option

and other small things. but mostly is removing javadoc