Cleaning up code. Removed HyperEndpoint (it's redundant... shifted the ONE use it had into RemoteEndpoint)
More code cleaning up.