Messy changes to remove commenting & permalink messages