Remove additional gatekeeper conditions