cleanup with https://github.com/Mr-Dave/motion.git , unstable