Remove more compatibility code.