Cleanup & Restoration

Cleanup & Restoration