Clear out old data, refactor bundle-graph