Remove user id hack