Code quality improvements. Removed some no-longer-needed logging.