Cleanup for demo