smash old stuff
userame
more cleanup, this still is not going to fix them failing specs, hrm