Remove old update logic, partial move to new one