Add missing modules to dependencies
Remove unused modules
Include missing modules