Got Rid of useless classes