Clean up and AVLString is pending to be implemented