Continue cleanup of key map table, not complete yet