Move 'freeze' to separate setting, remove freeze file