It does make sense to remove this obsolete stuff, but could you please not include it with this change as it's unrelated & in case of regressions they will be bound to each other.