removing need for entity