Remove another hardcoded instance of User