Fix a few derps

Hardware tunables derp and leftover hardware keys code fragment...

Change-Id: Idff8821d0f45ff6d2d8d86e72f2bd5697ac94610