It's a major pain, but clearing up is the way to go. Even if they sorted the clear up issue, I'd still go into the bodies and remove all weapons and sheilds as i do it without even thinking about it now.
If you're on PC, I highly suggest installing the USKP, as it does that for you (it "merges" the weapons and shields into the enemy's body, and although they are dropped as normal when an enemy is killed, accessing them will access the body instead, and thus they get cleaned up along with the body as well).