no more factory classes