[c12505] Cleanup battleground code

(based on commit ca5936a)