more clean ups for #9