Cleanups
	- Unify Ctx and EP ops