Removed excess classes