Cleanup of some remaining Logger stuff