Removed some 1.3 compatability code