Merge "remove more unused references to ISurface"