Cleaned out unused methods and refactored the creation of config for bundler.