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