get rid of ISurface

Change-Id: I84b356405aa1c3272e72e0f7673de34d5cc07a31