Removed all unnecessary entities.