diff --git a/libntfs/logging.c b/libntfs/logging.c
index 1c767196..d7b807e5 100644
--- a/libntfs/logging.c
+++ b/libntfs/logging.c
@@ -75,8 +75,7 @@ static struct ntfs_logging ntfs_log = (struct ntfs_logging) {
 	.levels = NTFS_LOG_LEVEL_INFO | NTFS_LOG_LEVEL_QUIET |
 			NTFS_LOG_LEVEL_WARNING | NTFS_LOG_LEVEL_ERROR |
 			NTFS_LOG_LEVEL_PERROR | NTFS_LOG_LEVEL_CRITICAL |
-			NTFS_LOG_LEVEL_PROGRESS |
-			0,
+			NTFS_LOG_LEVEL_PROGRESS,
 	.flags = NTFS_LOG_FLAG_ONLYNAME,
 	.handler = ntfs_log_handler_null,
 };
diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index 6a30cb21..9127dc13 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -86,7 +86,6 @@ static struct options {
 	const char *device;	/* Device/File to work with */
 	const char *filename;	/* Resolve this filename to mft number */
 	s64	 inode;		/* Info for this inode */
-	int	 debug;		/* Debug output */
 	int	 quiet;		/* Less output */
 	int	 verbose;	/* Extra output */
 	int	 force;		/* Override common sense */
@@ -137,9 +136,6 @@ static void usage(void)
 		"    -v, --verbose    More output\n"
 		"    -V, --version    Display version information\n"
 		"    -h, --help       Display this help\n"
-#ifdef DEBUG
-                "    -d, --debug            Show debug information\n"
-#endif
 	        "\n",
 		EXEC_NAME);
 	printf("%s%s\n", ntfs_bugs, ntfs_home);
@@ -158,9 +154,6 @@ static int parse_options(int argc, char *argv[])
 {
 	static const char *sopt = "-:dfhi:F:mqtTvV";
 	static const struct option lopt[] = {
-#ifdef DEBUG
-                { "debug",      no_argument,            NULL, 'd' },
-#endif
 		{ "force",	 no_argument,		NULL, 'f' },
 		{ "help",	 no_argument,		NULL, 'h' },
 		{ "inode",	 required_argument,	NULL, 'i' },
@@ -192,9 +185,6 @@ static int parse_options(int argc, char *argv[])
 			else
 				err++;
 			break;
-		case 'd':
-			opts.debug++;
-			break;
 		case 'i':
 			if ((opts.inode != -1) ||
 			    (!utils_parse_size(optarg, &opts.inode, FALSE))) {
@@ -280,7 +270,7 @@ static int parse_options(int argc, char *argv[])
 			err++;
 		}
 
-		if ((opts.inode == -1) && (opts.filename == NULL) && !opts.mft) {
+		if (opts.inode == -1 && !opts.filename && !opts.mft) {
 			if (argc > 1)
 				ntfs_log_error("You must specify an inode to "
 					"learn about.\n");
@@ -302,14 +292,6 @@ static int parse_options(int argc, char *argv[])
 
 	}
 
-#ifdef DEBUG
-	if (!opts.debug)
-		if (!freopen("/dev/null", "w", stderr)) {
-			ntfs_log_perror("Failed to freopen stderr to /dev/null");
-			exit(1);
-		}
-#endif
-
 	if (ver)
 		version();
 	if (help || err)