Better Mpeg concatenation for ffmpeg
Remove unused code in server file