fixed an issue where an inappropriate server connection was created
removed old and unused files