Cleanup btree fix