More cleanup, getting ready for candlestick data