Simplified the surface model by removing unnecessary arrays
Merge remote-tracking branch 'upstream/master' into surface