Code Inspection removed junk