Revert "Adding context to the Services class"

This reverts commit f60eb7c4636091224641e5afa160ced77bf38478.