Remove unnecessary backwards compatibility code