Get rid of the "service set" code