Refactor client spec
Remove unused code in production