Remove comanche specific stuff (Will bring inline later)