AR-15 Uppers

I need to get rid of this whole "uppers" section. I need to merge the information for the uppers with the lowers they belong to. I'm not really planning to swap around uppers and lowers.

5.56x45mm 14.5" Bushmaster M4 Upper
.30 Remington AR 22" Upper