remove some unnecessary commented code, clarify some others