Remove conflicting lines from cleanup