Initial cleanup of hours
Merge branch 'feature/hours-cleanup'