Removed unused USE statements
Fixed comments blocks