Customer clean up 1