EXISTS
and some cleanup