Tree clean up.
RZ Shell refactoring to stay DRY.