Cleanup and Containment

Cleanup and Containment