starting cleanup and upgrade