Code clean-up. Remove done jobs from the inline TODO lists.