Better clean of scripts and comments