Final changes

Cleanup script is complete.