Ensure we want to check for changes

ALso, removed excess format definitions