LPS-37822 Remove unused var
LPS-32653 Move to another method so it could be abstracted out later, or kept in this class to be used