Fix video and pre remove