REST: changes for cleaning up operations