Removed dependency of is_service_enabled function