comment cleanup in #59 cleaned up TODO comments, if we want to keep track of them, we should make them separate issues #61 also mentions TODO removals