Remove unneeded imports and Commenting