Bug 5596 Cleaning part 1