Cleaning up rest controller
Merged