Removed outdated weapon id checks