T16 Finishing simplification of handlers and requests