Minor cleanup
Merge pull request #546 from opuneet/dual_writes

Minor cleanup