Remove gunner code