Update the logging and removed extra imports.