More symbol cleaning/revising