roll back to using server_id in deletion