cleanup crud; replace whole-file with patch.  more useful for moving target