Hygiene: Move CleanupOverlay into its own file.

Change-Id: Id1fc6855b6875ef25aa789e16622d423b949038d