Bumped bundle, removed legacy support