clanup and update