CHOO Clean up