More weapon cleanup