Clean up demos code