Remove unused code.
Work in progress...
Work in progress... keymanager