Remove compatibility code