Debris Clean up

Debris Clean up