Remove abstract factories, now that we use Freemarker to avoid duplication / #SDT-27 Fixed