Chip-W Clean up