Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp"