some comments removed