Clean up identifiers