Add oncomplete callback
Clean up for demo