Remove Traces of Riak Prior to Integration of S3

This removes some left-overs from the ancient Riak integration to avoid merge conflicts with Seppo's S3 stuff.