Fix imports and remove unnecesary comments