Removed unused components, make Client more complete and use it in Advertise.