cleaned up some commented-out code in the client