Cleanup the "naive" 2-boundary definition