[BACKLOG-1142] REST services clean up from 5.2