Move the removal of the onchange into the render event