cleanup dumpsolv code