remove some comments and add timing