Issue #9: cleanup of key hygiene