Removes some rest v1 cruft
Minor tweaks.