Refactor weeks handlers; validate deletion of weeks