Housecleaning: Sync masters

Attempting to bring our masters back in line