Revert "Standardising the api errors and methods"

This reverts commit 83e7d296b664edb0230da54826aa73a328780f41.

Change-Id: I65a11acbcd22eca5b43d88f429c23f2ada25b4ab
Merge "Revert "Standardising the api errors and methods""