Change class names, remove extraneous "collapsed" classes.