Comment out entries requiring update work ( quite a bit )