Revert "added service factory creation"

This reverts commit f73ecd2865e78fc34669991f137607c52dda9a6f.
added service factory creation