Started identifier cleanup.