More cleaning, still two modules to go.