Clean up unused symbols and add inline type hinting