remove proxy mode abstraction: always be clear which mode we are in