Remove more old m4 stuff