Better support remove scalling