fix missing exports for server and remove dependency on Stepmachine