Delete old spike code
Merge branch 'master' into nhandler-remove-old-code
Merge branch 'nhandler-remove-old-code'