make compatible with 2.4.2.2 (and still 2.3.3). remove many instance args, which were not so useful anyway