Clean up to prep for hosting