diff --git a/clients/ccrtp/CMakeLists.txt b/clients/ccrtp/CMakeLists.txt
index 093b3691..60dc3f42 100755
--- a/clients/ccrtp/CMakeLists.txt
+++ b/clients/ccrtp/CMakeLists.txt
@@ -79,7 +79,7 @@ add_library(${zrtplibName} ${LIBRARY_BUILD_TYPE} ${zrtpcpp_src})
 set_target_properties(${zrtplibName} PROPERTIES VERSION ${VERSION} SOVERSION ${SOVERSION})
 target_link_libraries(${zrtplibName} ${LIBS})
 
-add_dependencies(${zrtplibName} ccrtp)
+# add_dependencies(${zrtplibName} ccrtp)
 
 # **** Setup packing environment ****
 #
diff --git a/clients/tivi/testdriver.cpp b/clients/tivi/testdriver.cpp
index 244abb95..9d27c820 100644
--- a/clients/tivi/testdriver.cpp
+++ b/clients/tivi/testdriver.cpp
@@ -137,13 +137,6 @@ int main(int argc,char **argv) {
     uint8_t buffer[1300];            // Recv buffer
     uint32_t uiSSRC = 0xfeedbacc;
 
-    EmojiBase32 emoji((unsigned char*)&uiSSRC, 20);
-    shared_ptr<string> resultEmo = emoji.u32StringToUtf8(emoji.getEncoded());
-    cout << "Size: " << dec << resultEmo->size() << ", " << resultEmo->c_str() << endl;
-
-    Base32 b32((unsigned char*)&uiSSRC, 20);
-    cout << b32.getEncoded() << endl;
-
     fprintf(stderr, "Config info: %s\n", getZrtpBuildInfo());
     
     CtZrtpSession::initCache("testzid.dat");        // initialize cache file
diff --git a/zrtp/ZrtpTextData.cpp b/zrtp/ZrtpTextData.cpp
index 447faea9..ef59b8f1 100644
--- a/zrtp/ZrtpTextData.cpp
+++ b/zrtp/ZrtpTextData.cpp
@@ -18,11 +18,9 @@
 /*
  * Authors: Werner Dittmann <Werner.Dittmann@t-online.de>
  */
-#include <stdint.h>
-#include <libzrtpcpp/ZrtpConfigure.h>
 //                             1
 //                    1234567890123456
-char clientId[] =    "GNU ZRTP 4.2.2  "; // 16 chars max.
+char clientId[] =    "GNU ZRTP 4.5.0  "; // 16 chars max.
 char zrtpVersion_11[] = "1.10";          // must be 4 chars
 char zrtpVersion_12[] = "1.20";          // must be 4 chars
 /**