Removed more non-generic stuff and also using HTTPUrlConnection rather than RestTemplate for calling services