Remove registration overrides in preparation for aliasing