Cleanup and prep for packaging