refactor symbol adding out of globals
remove unused methods