Feature/249 video clean