Starting some clean up in prep for new build