cleanup and temp fix for broken HOT provider templates