Cleaning useless classes