Small code / api cleanup. Need to fix kicking in general, especially in ServerConnector before release.