Remove the old grid layer before adding a new one

Addresses #366 

/cc @hampelm