remove logging.

Whoops.
Merge remote-tracking branch 'origin/cukes' into cukes
some cleaning