Continued gutting weapon and weapon header.