Removed code that worked with bundle