remove unused method and change join to includes