cgame: cleanup, refs #430