Removed inline type check in isRemovableFieldValue. Created separate isRemovableFieldValue methods. Non-storable values no longer filtered in removeFieldValues. Instead they will be caught by validateRemovableFieldValues if they're not removable.