Revert "delete separately if two together is fail"

This reverts commit 0d77ed9435bba984cab8a4f35e1cf957c0de3a66.
Merge remote-tracking branch 'origin/data-structure' into data-structure

Conflicts:
	GridSimplifierM.cpp
Merge branch 'data-structure' of https://github.com/xdoobx/2014demo into data-structure