Add a test case for remove()
Add try-catch to silently fall back to dynamo. Merge duplicate code for getting signature.