Closes #144 Remove old TODO comments