mark-i-m remove some more TODOs
Latest commit 1b88bd2 Apr 2, 2019