Removed Useless classes