More code cleanup. Removed BTree from repository