cleanup some commented code