Cleanup of rest dependencies - part 1
3 files changed