Removed completed stuff from TODO