Remove strange compatibility code