chore($handle-cleanup): specific endpoint handlers should be more focused (traditional) #1157