Removed some unused functions (and some EPs)