Update the Templates
Cleanup.