cleanup *Handler dependencies on CGame