Streamlining of epi modeling tools

@jamesazam wrote: