cleanup and remove some leftup