removed useless classes