delete grid stuff
fix conflict