[2.3] Remove deprecated calls (take care, this breaks compatibility with 2.2)