Clean Database - Beta Fields and Fix RI-Tree
Merge pull request #378 from javierluraschi/DatabaseCleanup

Clean Database - Beta Fields and Fix RI-Tree