Weapons won't be dropped on death