Remove extraneous logs, update TODO