Cleaned up unused/obsolete service