REST API refactoring by Udara
Refactored a bit more and removed unwanted params and methods