More cleanup after testing