Rheem Tools - Clean-Up

...