Still pex related code cleanup