Cleaned up some of the server and station code.