Cleaning up client issues request logic