remove riak specific items and shuffle things around