remove simple form, consolidate factories