Fixed what cleanup broke.