Removed wrong classes