purge keystone work arounds

these aren't needed any more, cleans up the code quite a bit to remove
them.

Change-Id: I512245345769bcf1755e5a314223e7dc31a4acbb