Removed some EPs and some unused functions