Removed unwanted imports and updated logging