Final cleanups for this phase