Remove surviving 'callback' code

Having previously forgotten about the callback option in logout, programs
could generally not actually complete.  Fix it so that logout() works as
intended.

Change-Id: I04394821646074c734438b7de6970c8282e2c761