remove more commented out code