Remove cleanup for a different PR.