Don't query unused values

lock() will be removing these params in the future and they are
unused anyway, so remove them

Test: make
Change-Id: I339c3b9ffa8e7a9cef50d1d80c8cd1a7d0950d82