Removal of hardcoded remote host