Remove some more explicit lifting