Added database cleanup