Address TODO for removing unnecessary using directives.