Final update for new clear database