Piles and piles of cleanup
Seems to be running now