Update commented blocks to new code