Missing symbols and code clean-up