Cleaned up bundles to not reference db package