Removed last Log statements, optimized imports.