More weapons/cleanup
More weapons/cleanup