reverting a few service setup changes
that entire process needs to be revamped