Get rid of more extraneous keys