Remove additional handlers, opt for headers field

Reverts most of 6a698b2.
Merge branch 'development'