Pushing half-finished cleanup.