LPS-44655 Update variable names and remove checks