Customer Clean up 3