Added javadoc and removed un-used imports