Get rid of MarketData for now
Simplify component
Simplify Component