Remove use of local symbol tables