Removed advertising code.

Change-Id: I71a81c0ebb35caccdb61a1bb536626f1296dddb9