Cleanup is following

Cleanup is not following anyone.