Remove joins as includes does it automatically