clean up of server changes