Cleaned up a lot.

Cleaned: util merged from the two util files, and … some other things
maybe.  Keyup is deleted.