Merge "More code cleaning"