Migrate forward

@kentquirk This removes the old legacy logic and migrates gatekeeper forward