Factory/Warehouse cleanup
- Remove redundant methods from the factory
- Remove remaining calls to obsolete factory methods
refs #3692
Merge pull request #4050 from permcody/warehouse_cleanup

Factory/Warehouse cleanup