WIP: remove unwanted avl support