Remove duplicate and improve not installed case