Minor TODO cleanup