Remove unneeded identifiers