Remove user/host hardcode