Cleanup at the X6Rack level.
Fleshing out a bit of the X6 level.