Dropped old compatibility code