Add initial handling of key combos; remove some dead code