Customer Clean up 2