MEP Declarations ++ ep_meps code cleanup