Removed useless classes