Removed special case of cors helper
Tidied up resource future handling code