update Marconi Server, remove some redundancies