cleaning up some winston draft stuff