Cleanup + tool preps