Server upgrade in progress

Also server cleanup