Cleanup server (app.js)
Removing remnants of sinon/require tactic and general cleaning