cleanup bundle manifests, remove "uses" clause; hopefully this might make startup a little faster too