remove unused vars
Merge branch 'bug/video-markup' into dev