Cleanup for Project Restart