Remove logs and change names of some vars to match frontend