Migration cleanups