Clean up some logging code, fix BC pump memory leak. Fixes #494Signed-off-by: Ross Allan <[email protected]> (commit: 5c271d0)