Log cleanup. refs #39