Remove left over debugging codes and comments