yep good point should clean up some of the code and tests as well