Removing heavy, no. But I think that at some time into the Match, heavy should be automatically added to all guardians instead of spawning. Players would be more focused in fight strategy instead of running after the heavy ammo spot.