Hunting down some logging issues and removing some unneeded imports.