Remove one extra codepath