diff --git a/ChangeLog b/ChangeLog
index cdbac2e8b..007f60418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,6 @@ Changes
      don't use the optimized assembly for bignum multiplication. This removes
      the need to pass -fomit-frame-pointer to avoid a build error with -O0.
    * Disabled SSLv3 in the default configuration. 
-   * Add exit value macros to the platform abstraction layer.
 
 = mbed TLS 2.2.1 released 2016-01-05
 
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 3765a0ae0..6ca07bba2 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -52,7 +52,6 @@
 #include "mbedtls/ecjpake.h"
 #include "mbedtls/timing.h"
 
-//#include <stdio.h>
 #include <string.h>
 
 #if defined(MBEDTLS_PLATFORM_C)