Remove old compatibility code