Clean up , prepare for froyo camera