Clean up to make ready for I3Live deps
Cleanup and prep for real stuff