Add VP9 support and also clean out some unused code