- cleaned some weapon code