More cleanup after testing multiple hives