Some clean up of modules