Cleaned up device server init