13.03 cleanup