Merge "Remove un-used code of RestTemplate"