Bunch of random stuff to clean up