Removed unused ServiceProvider
Removed stdClass stuff for now