Remove duplicate qualifiers
Fix
Update subs