Cleanup the web-api and backend integration code

[windoverwater]

Need to clean up the code as it has not yet been adequately reviewed

[stratofax]

I would say instead: write tests for the backend code before you start cleaning it up.

[windoverwater]

Need tests prior to this