[nim, dj] Cleaning up