Removed not required imports, logging