BUG: Incomplete refactorings done for Autoworkup

Refactoring to isoloate template from atlas based workups
was incomplete.  This patch removes references to
functions that were removed.