database.c cleanup