Slim down, riak changes