Clean up Symbols

Change-Id: I97eab71d3b1db6b1fc02253a01b3b44ed390ca44