Useless classes removed