Code Migration Cleanup

Prior to this commit there were a few bad cut and pastes