Refactor bsv movie free duplication