Cleanup top-level factory