Cleaning code.  Commenting out addon to write tests.