cleanup, officially 2.2 supported