Clean up the winFang layout stuff.