Remove some redundant subinterface calls