Removed unused include
Fixed PR comments.