service switch elimination (#37)