Merge pull request #1862 from pinterest/1456-miscellaneous-todo

Cleanup miscellaneous todo's

Closes #1456