Bug 21943: Clean up holds template