Cleanup for DS