more Djinn cleanup