Remove UserEntity and use of users table