36 cleanup