Cleanup after video share merge + SHKFile addition