Tons of cleanup in prep