OZF-249: Removal of a lot of code that references serviceItem and was no longer being used