Remove comments, fix so only goes after non-tagged treasures