Surface usage removed