Remove unecessary class by enhancing an existing one a bit