Add comments for classes
Remove unused classes