clean up

[wenisman]

• cleanup the keys... by removing dead ones
• remove the remaining cb and rename to callback. (i miss you resharper)
• move the error response, se we dont try to write to a sent response