clean-up following Surface split

Change-Id: I853a76d92d957ee38a36fcdd280d6407ec316987
16 files changed