gy86 cleanup