Removal of useless classes