Fixing cleanup domination issue