Some code clean up and paving the way for additional features
Clean up, REST API no longer needs the zone or partition text, just a zone or partition number