Modular install works but directory cleaning is still buggy