Finish transition to new gates