tidy up of candle matcher, remove price aggregator