silly hack
remove unused keys
more silly shuffles