Cleanup, made working with a single server working again