Cleanups, changed to use new web-send-json-response expression evaluation