cleanup state variable namespace for server