remove some deviouschimp-specific bits