Got rid of useless classes