Simplify server, fix worker