Changes from LokaPvP
Remove some old stuff?
Merge remote-tracking branch 'origin/master'