Refactoring and removed some Riak support methods