remove all the 2.4 stuff; just keep module loads