revert CoreUser to be just User