Map, Registration VC cleanup + update to new API