Cleanup and some migration from old sensu builds