Remove some troublesome crud