Update to newest server and further simplify code