refctoring using Bundler.clean_system