Removed deprecation code entirely - I can restore it quickly if required.