Removed some weapons registration warnings
Removed dead code