removed entity type from model and other places