Clone clean up, took off some debug data.