remove some debugging, but still have issues with unset fields on
production