clean up bundles and get conceal feature working