Comments and removing an unused import