Clobber more WiMax stuff

Change-Id: Ie446a88976a3389608b155b02cadfa31c939276d