Cleaned up obsoleted test code