Bug 803934 - Ensure hours cleanup