Remove more pre-4.0+ compatibility code