removed extra entities