removed obsolete TODOs, etc.