cleanup cmkae stuff