More cleanup of modules