Cleanup.
grrrrridedit merge