uber update (clean)

yeargh :(