Removing legacy identifiers