Trimmed down some logging