check argument to removeClaims() so that if single claim is provided it will make a one element list with that claim

Change-Id: Icc4a842e874f7f6cf341872c305e41b942087163