Surface: Cleanup (isAttachedToMap() is unnecessary)