Cleaned up some TODOs