Cleanup for dojo