Merge "Removed unused imports and log file"