added changed variables and remove unused bundles