Remove user types rename for now