cleaned up useless classes