cleanup of Weapon, removed done TODO's and legacy code