Remove alias from service provider

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Fixed multiple code issues

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'