Factory/Warehouse cleanup

- Remove redundant methods from the factory
- Remove remaining calls to obsolete factory methods
refs #3692