Removed multiple imports and comment clean up