#2397 - Cleanup in  theme