remove keymaster stuff