JS -> LS conversion cleanup