Some cleanup, prepare to move the js css into less.