Cleanup
More cleanup
Update ffmpeg to latest version