Remove no longer used service module