Merge "Removal of dead code"