remove some commented code, other minor changes