BUGFUX: clean up keyfile setup