Clean up and change default area set.