Removed more factory methods