Cleaned up some old TODOs