Switch to eppn and prune some dead code