Some cleanup in the extra modules.