DrawSurface uses new mapping. Finished converting to new mapping style. Removed unused functions.