Change / clean up a scary amount of stuff