handlers dict needs to be in AuthorizedClient; cleanup