removed more deviouschimp specific stuff