Steps towards removing the Restify dependency