Finish up the code migration