Remove unused function.
Update key lookup from key ID.

I don't think we need to support the UNION from the original SQL query here:
They way we create SubKeys should mean that their corresponding PubKeys
always exist.