[BUGFIX] Fine tune database reset