Remove alias from service provider

Signed-off-by: crynobone <crynobone@gmail.com>
Cleanup multiple issue on the code

Signed-off-by: crynobone <crynobone@gmail.com>