Add 'smart home key' mapping. Start clean up.