Remove unnecessary namespace qualifiers