lib betterpicker cleanup for submodules