remove more commented code