Adding optional parameters type and target to <remove> stanza.