Cleaning up according to issue regarding Client