Remove nested keys to fix issues with key mirror

In response to some issues @ltk and @efatsi bumped into.