Removed 2D memory model.
Merge branch 'removing2d' into develop