added tokenizing to remove method...