Some code review comemnts removed