Clean up the BasicDemo and Model 1