Remove some logging.  Add TODOs