Fix event removal in grid control. Fixes #440