Cleanup weapon rotation code