Clean up factory functions

Get rid of unused functions and reduce overload crazy.