Optimize imports.
Add more asserts for testing transactions around element removal.
Merge remote-tracking branch 'origin/master'