Removed old client module
Minor tweaks to code and configuration