removing client state tracking for now