Remove unneccessary class names