Removed useless entities