Merge pull request #8 from Meneth/RoI

Cleanup
Duplicate barrony cleanup
last duplicates
More fixes