Cleanup battleground code

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