More work on flip2
Remove unused parts.
More organizing of flip2, mostly.