Clean up new templates