[s1901] Cleanup battleground code

Signed-off-by: Carl Hjerpe <lillecarl@gmail.com>

(based on commit 4814020)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>