moar user cleanup
bleurgh
bleurgh