Removed pointless imports in the code