Ok, you can get rid of these lines if EE < 2.6 isn't an issue then :)