thought i deleted this..
Update TODOs
Remove commented-out code, add type check