Removed a few uneeded qualifiers