Removed unecessary flag.

Plan is to eventually move this away from epp namespace.
Can not do this right now as some of it will need to be
refactored into an unfinished module