Remove errant patch file & other minor tweaks