Remove deprecated shouldUseKeys method

This patch removes all uses of the method
as well as the method itself

Change-Id: I463532c187e9c4bbae081f5808effcad8c8fe0a5