Removed finished TODO's.