Clean up keystone db workarounds