Remove some debug, minor adjustments