Cleaned up some completed TODOs