slight cleanup of cafe code away from using server_message

need to test on test server