Removed some unused EPs