cleaned up most templates