Go back to solution without GenServer, but trim remaining pairs