HUGE deletion and rearchitecting of interfaces