Cleanup for Robert by Costa.