Removed remaining to-do items for R2.0