remote the total graph setup
clean out old factories
move from embedding to has_many/belongs_to