Cleaned up logging for some ops