correct comment
adjust comment
remove unused classes
remove log statements