Remove Roomkey cruft