Minor change (remove an import)
Some more changes