n7000: keyfiles and extract cleanup

Change-Id: I62459f26a68e60d584b76f7cbfeff3dd643ceb36