Some cleanup of modules