Clean-up after change to RestApi