extra classes still getting committed somehow