Get logging straight, remove unused imports