Did some minor changes like deleting unused import or fixing javadoc.