remove some unwanted comments
update changes