minor change (removed two TODOs)