Bye bye old dirty MarketInfo factory