Cleanup heirlooms

@thbishop @rickmendes @brettweavnet 

This isn't done yet but I wanted you all to take a look because I feel I have started to do some of the same types of refactorings that @rickmendes has done in simple deploy.