removed entity suffix