Some cleanup, trying to get the REST client working