Exclude more unnecessary groups from bundle