Clean up unused logging. Prepare for pull req