Removing references to ehelms and Eric.