Remove User model dependency in account/models