General cleanup. Need to revisit offset/limit for the paged api calls.