remove riemann health
Split up stuff destined for server vs client