Updates from investigating diff
 * Remove files no longer needed and not removed from patch
 * Resolve some remaining conflicts