fix for devicepage remove