Some cleanup in AnonymizeCommand