Revert "LPS-46210"
LPS-46210 Removing unused vars