Remove console logging, update TODOs