Cleanup
Implement override_originator feature
Explicitly delete ets tables
Roll 2.2.0