Removes some TODO's and code clean up