Resolves #421

Commented out Client Handler for ccd473b3cb61fd73bed59af78554659c26849801