Remove unnecessary class
Add comments on insistence of a certain person