Made market data webservice more generic, so cleanup now happens client side