Removed code that worked with bundle; close #19