Remove some reliquates of old interface