Removing unneeded import and logging