support new e2p layout in powerswitch
cleanup: remove unnecessary cast