get rid of almost useless classes