Another template clenaup attempt.