symbol and token -> typedef structs; removed dead code... -sai