Merge "Removing dead code"