VIVO-246 Set up the Freemarker directives in only one place.
VIVO-246 Continue cleanup