Fix / cleanup instantiation of service objects