Some more EP removals (ctxt . GetEP() removals)