31453 cleanup