Clean up symbols

Change-Id: I6ce33b664d441ed96fdf73bfd0081ebba0284554