That sounds fine. Maybe add a todo? This seems fairly low impact though.. some small things we could maybe break, if they are low level enough that they are unlikely to have been used and it is easy to port code forward.