John, Sumit | removed shr-api