:lipstick: key cleanup

Change-Id: Ic53f718db1e2e620af7a242a25d8cea6ddd2d169