Removals of GetEP() calls where possible