Removeing unneeded imports
Add Javadoc Notes
Remove import