cleaned up rest calls