removing extra classes
mega updates