Add custom datastructure for response headers
Remove some old, unused code