main battle class cleanup