Tidy up, remove pointless promise wrapper around server