Javadoc corrections
Minor change in future eBook support
Imports clean-up
Remove unneccessary function