Remove references to client IDs