Merge delete and expire check
Unicode test
Small refactoring