diff --git a/src/camera.hpp b/src/camera.hpp
index 56ce87fa..9cb6d786 100644
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -169,7 +169,6 @@ class cls_camera {
         int     text_scale;
         int     watchdog;
         bool    movie_passthrough;
-        int     filetype;
         char    eventid[20];
         char    text_event_string[PATH_MAX];
         char    hostname[PATH_MAX];
diff --git a/src/motionplus.hpp b/src/motionplus.hpp
index d13282ea..fbc49019 100644
--- a/src/motionplus.hpp
+++ b/src/motionplus.hpp
@@ -121,18 +121,6 @@ class cls_webu_stream;
 
 #define MYFFVER (LIBAVFORMAT_VERSION_MAJOR * 1000)+LIBAVFORMAT_VERSION_MINOR
 
-/* Filetype defines */
-#define FTYPE_IMAGE             1
-#define FTYPE_IMAGE_SNAPSHOT    2
-#define FTYPE_IMAGE_MOTION      4
-#define FTYPE_MOVIE             8
-#define FTYPE_MOVIE_MOTION     16
-#define FTYPE_MOVIE_TIMELAPSE  32
-#define FTYPE_IMAGE_ROI        64
-
-#define FTYPE_MOVIE_ANY   (FTYPE_MOVIE | FTYPE_MOVIE_MOTION | FTYPE_MOVIE_TIMELAPSE)
-#define FTYPE_IMAGE_ANY   (FTYPE_IMAGE | FTYPE_IMAGE_SNAPSHOT | FTYPE_IMAGE_MOTION | FTYPE_IMAGE_ROI)
-
 #define AVGCNT            30
 
 #define IMAGE_MOTION     1
diff --git a/src/movie.cpp b/src/movie.cpp
index 11b53f24..7fc18cf7 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -1270,7 +1270,6 @@ void cls_movie::stop()
     }
 
     if ((movie_type == "norm") || (movie_type == "motion") || (movie_type == "extpipe")) {
-        cam->filetype = FTYPE_MOVIE;
         on_movie_end();
         cam->app->dbse->exec(cam, full_nm, "movie_end");
         if ((cam->cfg->movie_retain == "secondary") &&
@@ -1286,7 +1285,6 @@ void cls_movie::stop()
             cam->app->dbse->movielist_add(cam, this, ts);
         }
     } else if (movie_type == "timelapse") {
-        cam->filetype = FTYPE_MOVIE_TIMELAPSE;
         on_movie_end();
         cam->app->dbse->exec(cam, full_nm, "movie_end");
     } else {
@@ -1494,8 +1492,6 @@ void cls_movie::start_norm()
         return;
     }
 
-    cam->filetype = FTYPE_MOVIE;
-
     on_movie_start();
 
     cam->app->dbse->exec(cam, full_nm, "movie_start");
@@ -1556,7 +1552,6 @@ void cls_movie::start_motion()
         return;
     }
 
-    cam->filetype = FTYPE_MOVIE;
     on_movie_start();
     cam->app->dbse->exec(cam, full_nm, "movie_start");
     is_running = true;
@@ -1612,7 +1607,6 @@ void cls_movie::start_timelapse()
         return;
     }
 
-    cam->filetype = FTYPE_MOVIE_TIMELAPSE;
     on_movie_start();
     cam->app->dbse->exec(cam, full_nm, "movie_start");
 
@@ -1662,7 +1656,6 @@ void cls_movie::start_extpipe()
 
     setbuf(extpipe_stream, nullptr);
 
-    cam->filetype = FTYPE_MOVIE;
     on_movie_start();
     cam->app->dbse->exec(cam, full_nm, "movie_start");
     is_running = true;
diff --git a/src/picture.cpp b/src/picture.cpp
index 65f74011..696b94cc 100644
--- a/src/picture.cpp
+++ b/src/picture.cpp
@@ -61,7 +61,6 @@ void cls_picture::process_norm()
         picname(filename,"%s/%s.%s"
             , cam->cfg->picture_filename
             , cam->cfg->picture_type);
-        cam->filetype = FTYPE_IMAGE;
         if ((cam->imgs.size_high > 0) && (cam->movie_passthrough == false)) {
             save_norm(filename, cam->current_image->image_high);
         } else {
@@ -78,14 +77,12 @@ void cls_picture::process_motion()
 
     if (cam->cfg->picture_output_motion == "on") {
         picname(filename,"%s/%sm.%s", cam->cfg->picture_filename, cam->cfg->picture_type);
-        cam->filetype = FTYPE_IMAGE_MOTION;
         save_norm(filename, cam->imgs.image_motion.image_norm);
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
 
     } else if (cam->cfg->picture_output_motion == "roi") {
         picname(filename,"%s/%sr.%s", cam->cfg->picture_filename, cam->cfg->picture_type);
-        cam->filetype = FTYPE_IMAGE_ROI;
         save_roi(filename, cam->current_image->image_norm);
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
@@ -107,7 +104,6 @@ void cls_picture::process_snapshot()
         picname(filename,"%s/%s.%s"
             , cam->cfg->snapshot_filename
             , cam->cfg->picture_type);
-        cam->filetype = FTYPE_IMAGE_SNAPSHOT;
         if ((cam->imgs.size_high > 0) && (cam->movie_passthrough == false)) {
             save_norm(filename, cam->current_image->image_high);
         } else {
@@ -131,7 +127,6 @@ void cls_picture::process_snapshot()
             , cam->cfg->snapshot_filename
             , cam->cfg->picture_type);
         remove(filename);
-        cam->filetype = FTYPE_IMAGE_SNAPSHOT;
         if ((cam->imgs.size_high > 0) && (cam->movie_passthrough == false)) {
             save_norm(filename, cam->current_image->image_high);
         } else {
@@ -160,7 +155,6 @@ void cls_picture::process_preview()
             , cam->cfg->picture_filename
             , cam->cfg->picture_type);
 
-        cam->filetype = FTYPE_IMAGE;
         if ((cam->imgs.size_high > 0) && (cam->movie_passthrough == false)) {
             save_norm(filename, cam->imgs.image_preview.image_high);
         } else {
@@ -410,8 +404,7 @@ void cls_picture::pic_write(FILE *picture, u_char *image)
 {
     int width, height;
 
-    if (((cam->filetype == FTYPE_IMAGE) || (cam->filetype == FTYPE_IMAGE_SNAPSHOT)) &&
-         (cam->imgs.size_high > 0) && (cam->movie_passthrough == false)) {
+    if ((cam->imgs.size_high > 0) && (cam->movie_passthrough == false)) {
         width = cam->imgs.width_high;
         height = cam->imgs.height_high;
     } else {
diff --git a/src/util.cpp b/src/util.cpp
index 17b45fb0..d718e0db 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -372,10 +372,6 @@ void mystrftime_base(cls_camera *cam
         } else if (fmt.substr(indx,2) == "%f") {
             user_fmt.append(fname);
             indx++;
-        } else if (fmt.substr(indx,2) == "%n") {
-            sprintf(tmp, "%d", cam->filetype);
-            user_fmt.append(tmp);
-            indx++;
         } else if (fmt.substr(indx,2) == "%$") {
             user_fmt.append(cam->cfg->device_name);
             indx++;