Merge "Remove code that does nothing"