Added code for removal of qualifiers