Further clean up

clean up unused variables
Weapon gui
Merge master
merge master