Clean DrawingSurfaceInfo

Preserve previous behaviour