move keyguard_obsolete part 2