Skip to content

simplify, cleanup surface handling infrastructure