Fixed onRemove weapon bugs