More polish

remove some diagnostic prints etc.