Clean up, e removido UpDown
Service cleaned up