struck off a couple of TODOs