Cleanup

like #23 but without the log clutter.