cut out some redundancies