further Djinn cleanup