deleted grid submodule in order to merge with master