Make CTRL-C work
Remove some garbage code