Remove use of experimental keys with hashref