[cleanup] Remove Identifiers that are no longer referenced