Layer remove improvement.