removing superfluous classes and 1 with underscore