Removing things that don't need to exist in SDK; no need to store selected server, fixing up some code that could result in a bad deserialization.