Removed all our logic from SDK. Removed unnecessary try-catch