Remove user thing. Will put that into another PR