Cleanup of scidb.c