Merge "Remove redundant code constructs"