Baseline project before Clean-up

Backup before clean up